Micron Document
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
| SparkN0de-git | SparkN0de |
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Node / ReticulumProjects / Sideband.git / commits / 982439c


Commit 982439cc2e897ecc4fcfe199b2e7f231b7123f62

󰉖 Browse tree at this commit

Parents : c499706
Author : Mark Qvist <mark@unsigned.io>
Date : 2022-11-23T21:19:31+01:00

Added ability to control bluetooth settings on RNode devices that were connected over USB after Sideband was started

Changes

1 files changed, 9 insertions(+), 0 deletions(-)

M sbapp/sideband/core.py +9

Diff

diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py
index fc5b8cef..2694277d 100644
--- a/sbapp/sideband/core.py
+++ b/sbapp/sideband/core.py
@@ -1259,6 +1259,7 @@ class SidebandCore():
if self.getstate("wants.bt_on"):
self.setstate("wants.bt_on", False)
+ self.owner_app.discover_usb_devices()
self.setstate("executing.bt_on", True)
if self.interface_rnode != None:
self.interface_rnode.enable_bluetooth()
@@ -1267,10 +1268,13 @@ class SidebandCore():
if len(self.owner_app.usb_devices) > 0:
target_port = self.owner_app.usb_devices[0]["port"]
RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, enable_bluetooth = True)
+ else:
+ RNS.log("Could not execute RNode Bluetooth control command, no USB devices available", RNS.LOG_ERROR)
self.setstate("executing.bt_on", False)
if self.getstate("wants.bt_off"):
self.setstate("wants.bt_off", False)
+ self.owner_app.discover_usb_devices()
self.setstate("executing.bt_off", True)
if self.interface_rnode != None:
self.interface_rnode.disable_bluetooth()
@@ -1279,10 +1283,13 @@ class SidebandCore():
if len(self.owner_app.usb_devices) > 0:
target_port = self.owner_app.usb_devices[0]["port"]
RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, disable_bluetooth = True)
+ else:
+ RNS.log("Could not execute RNode Bluetooth control command, no USB devices available", RNS.LOG_ERROR)
self.setstate("executing.bt_off", False)
if self.getstate("wants.bt_pair"):
self.setstate("wants.bt_pair", False)
+ self.owner_app.discover_usb_devices()
self.setstate("executing.bt_pair", True)
if self.interface_rnode != None:
self.interface_rnode.bluetooth_pair()
@@ -1291,6 +1298,8 @@ class SidebandCore():
if len(self.owner_app.usb_devices) > 0:
target_port = self.owner_app.usb_devices[0]["port"]
RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, pairing_mode = True)
+ else:
+ RNS.log("Could not execute RNode Bluetooth control command, no USB devices available", RNS.LOG_ERROR)
self.setstate("executing.bt_pair", False)
if (now - last_usb_discovery > 5):


──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────